From d96f17f50c621be30e5c73da9317c91d8cbbf3e1 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Thu, 5 Apr 2018 19:54:26 +0100 Subject: [PATCH] tools/libxl: Fix build following c/s 74fd984ae c/s 74fd984ae "tools/libxl: Drop xc_domain_configuration_t from libxl__domain_build_state" removed state->config completely, but the GIC version is available in info. Use the up-to-date version. Signed-off-by: Andrew Cooper Acked-by: Wei Liu Release-Acked-by: Juergen Gross --- tools/libxl/libxl_arm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index fbe8786a8e..177c6b745c 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -846,9 +846,6 @@ static int libxl__prepare_dtb(libxl__gc *gc, libxl_domain_build_info *info, const libxl_version_info *vers; const struct arch_info *ainfo; - /* convenience aliases */ - xc_domain_configuration_t *xc_config = &state->config; - vers = libxl_get_version_info(CTX); if (vers == NULL) return ERROR_FAIL; @@ -857,7 +854,8 @@ static int libxl__prepare_dtb(libxl__gc *gc, libxl_domain_build_info *info, LOG(DEBUG, "constructing DTB for Xen version %d.%d guest", vers->xen_version_major, vers->xen_version_minor); - LOG(DEBUG, " - vGIC version: %s", gicv_to_string(xc_config->gic_version)); + LOG(DEBUG, " - vGIC version: %s", + gicv_to_string(info->arch_arm.gic_version)); if (info->device_tree) { LOG(DEBUG, " - Partial device tree provided: %s", info->device_tree); -- 2.30.2